From 403655a364b430d3aa6941e6ff3a38767eb76cb2 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 29 Jan 2018 17:52:54 +0000 Subject: [PATCH] no-openssl don't add -lssl etc if not needed (because we use system-postgresql) Gbp-Pq: Name no-openssl.diff --- RepositoryExternal.mk | 72 +------------------ config_host.mk.in | 4 -- configure.ac | Bin 451131 -> 449269 bytes connectivity/Library_postgresql-sdbc-impl.mk | 1 - external/Module_external.mk | 1 - oox/CppunitTest_oox_tokenmap.mk | 9 --- oox/Library_oox.mk | 9 --- ucb/CppunitTest_ucb_webdav_local_neon.mk | 1 - ucb/CppunitTest_ucb_webdav_neon_opts.mk | 1 - ucb/CppunitTest_ucb_webdav_propfindcache.mk | 1 - ucb/CppunitTest_ucb_webdav_res_access.mk | 1 - ucb/Library_ucpdav1.mk | 2 - 12 files changed, 2 insertions(+), 100 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index dd5673901bc..717b59233f4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1482,75 +1482,6 @@ endef endif # SYSTEM_HARFBUZZ -ifeq ($(DISABLE_OPENSSL),TRUE) - -gb_ExternalProject__use_openssl:= -gb_LinkTarget__use_openssl_headers:= -gb_LinkTarget__use_openssl:= - -else # !DISABLE_OPENSSL - -ifneq ($(SYSTEM_OPENSSL),) - -gb_LinkTarget__use_openssl_headers:= -gb_ExternalProject__use_openssl:= - -define gb_LinkTarget__use_openssl -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(OPENSSL_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS)) - -endef - -else # !SYSTEM_OPENSSL - -$(eval $(call gb_Helper_register_packages_for_install,ooo, \ - openssl \ -)) - -define gb_ExternalProject__use_openssl -$(call gb_ExternalProject_use_package,$(1),openssl) - -endef - -define gb_LinkTarget__use_openssl_headers -$(call gb_LinkTarget_use_external_project,$(1),openssl) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,openssl)/include \ - $$(INCLUDE) \ -) - -endef - -define gb_LinkTarget__use_openssl -$(call gb_LinkTarget_use_package,$(1),openssl) -ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \ - $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \ -) -$(call gb_LinkTarget_use_external_project,$(1),openssl) -ifeq ($(OS),SOLARIS) -$(call gb_LinkTarget_add_libs,$(1),\ - -lnsl \ - -lsocket \ -) -endif -endif - -endef - -endif # SYSTEM_OPENSSL -endif # DISABLE_OPENSSL - - ifeq ($(DISABLE_OPENSSL),TRUE) define gb_LinkTarget__use_gnutls @@ -3033,9 +2964,10 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ ) -ifeq ($(OS),WNT) $(call gb_LinkTarget_use_external,$(1),openssl) +ifeq ($(OS),WNT) + $(call gb_LinkTarget_use_system_win32_libs,$(1),\ secur32 \ ws2_32 \ diff --git a/config_host.mk.in b/config_host.mk.in index 6040362941d..442aa5dc7be 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -97,7 +97,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ -export DISABLE_OPENSSL=@DISABLE_OPENSSL@ export DISABLE_PYTHON=@DISABLE_PYTHON@ export DLOPEN_LIBS=@DLOPEN_LIBS@ export DLLTOOL=@DLLTOOL@ @@ -419,8 +418,6 @@ export OFFICEOTRON=@OFFICEOTRON@ export BFFVALIDATOR=@BFFVALIDATOR@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ export OOO_VENDOR=@OOO_VENDOR@ -export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ -export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ export OS=@OS@ @@ -555,7 +552,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@ export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@ export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@ export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@ -export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@ export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ export SYSTEM_POPPLER=@SYSTEM_POPPLER@ export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@ diff --git a/configure.ac b/configure.ac index c3d94c4365a39dbe41fbf6e3c557dfb819e30726..f991c3dc14972822269603b739ff7b85f6ac78ca 100644 GIT binary patch delta 29 lcmdmeMEdJi>4p}@7N!>F7M3lnf*kGP{H)u<`PrUa0syNR3YP!? delta 1232 zcmcgrO=}ZT6eW`n(@?0fDO3yXZK}0}%p|dCV<{<3KP|+hbW;4NVSLHFW*$!Fg_)^o z5Nw5l8#m(OZT$&?ib_|43zsUoaU+6%z(sdLeMu$}TX5+tW`_IboO|w>dk$X?9K0LY z+js2?`|f?u3vbZRZXbC3zA82>OMmhpy4th2DyQc&OG<8SDJ#nv7992t_Nl}|MIA$q zf5?llZJ{z|!Ec@r`|9_0v%7CRgX|e|b+P0ZcTZOe7Li#a2C$%8=$&n0hy^OHnz)2) ztU^u01{Al6t`egRThxSjOiBWO>ipc40^nRD?D->?G?Prkrlu29(VA8li6x?HRmWnR zk5h=WHG@bDv4Tp}65}y3De8n8O@fJJA~`u7PegT6ESdGHO*?3;inIw5Icnz*F2IzK z(AVP-rwrQE#6BE(1_zvCA+qWC#NV76dzSdpgJm>y7^~am;el`>ox;rwz2ZbRv zH|;)i){zO;cC|`P+XDGYdNO{gFwT(T?spf)0}MU&jIce)7n*QBj#?U$wAlhTcC(|i z;YJIqEab04i5fQEv1eHBy*F~vpb=j0W&$Yl@ z_l04$=Mw_E$5y^&S+nN|)R1X_tsxtbZfkVAtaU=rSm;(R)CgF0%f=Pp+hrn?U<)d! z-q?3+s6Y)Mc9So?pj?$#lxykr?AT_`3Dd5IEGS~0hc+FTP5E#t=C?|f=zN4?9Wtbt zgBsCw&V2{-3}T>LoSDbS{=2`^zGPyaB_M`Mc4={JGRiCh2x diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 53cebd01a24..e18e6543e62 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ boost_headers \ postgresql \ $(if $(filter-out MSC,$(COM)), \ - openssl \ openldap \ nss3 \ plc4 \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 59c709838e0..462b0d7c703 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -77,7 +77,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,NSS,nss) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \ $(call gb_Helper_optional,PAGEMAKER,libpagemaker) \ diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk index 8019da7a230..0c6ab952a81 100644 --- a/oox/CppunitTest_oox_tokenmap.mk +++ b/oox/CppunitTest_oox_tokenmap.mk @@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap)) $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox)) -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\ - openssl \ - openssl_headers \ -)) -else -ifeq ($(TLS),NSS) $(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\ plc4 \ nss3 \ )) -endif -endif $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\ avmedia \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index a21157be131..d5ce09d38eb 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -67,19 +67,10 @@ $(eval $(call gb_Library_use_externals,oox,\ boost_headers \ )) -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_Library_use_externals,oox,\ - openssl \ - openssl_headers \ -)) -else -ifeq ($(TLS),NSS) $(eval $(call gb_Library_use_externals,oox,\ plc4 \ nss3 \ )) -endif -endif $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk index df16e36409b..28fa8216883 100644 --- a/ucb/CppunitTest_ucb_webdav_local_neon.mk +++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\ diff --git a/ucb/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk index 91e167b083a..21e52573f86 100644 --- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk +++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\ diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk index ebbaee7898e..e2d064ef034 100644 --- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk +++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\ diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_res_access.mk index ac48f87bc87..c7d151ea40d 100644 --- a/ucb/CppunitTest_ucb_webdav_res_access.mk +++ b/ucb/CppunitTest_ucb_webdav_res_access.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index f4afd730c74..7016cf223d9 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_Library_use_custom_headers,ucpdav1,\ @@ -72,7 +71,6 @@ else # WITH_WEBDAV == serf $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ apr \ - openssl \ serf \ zlib \ )) -- 2.30.2